| author | Stefan Monnier <monnier@iro.umontreal.ca> | |
| Fri, 12 Nov 2010 13:35:36 +0000 (08:35 -0500) | ||
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | |
| Fri, 12 Nov 2010 13:35:36 +0000 (08:35 -0500) | ||
| commit | 4e9e1584fd08ee318589e70049dd22429fd7e9c3 | |
| tree | c05558bb08f19ee31b43fd8615f1aec79d6cd07a | tree | snapshot |
| parent | 4490f87580a8f9ade324ea1d3a095dddca8ecf1d | commit | diff |
| lisp/ChangeLog | diff | blob | history | |
| lisp/vc/smerge-mode.el | diff | blob | history |